Remove deprecated gdk_window_get_pointer
authorMatthias Clasen <mclasen@redhat.com>
Tue, 25 Oct 2016 23:45:48 +0000 (19:45 -0400)
committerMatthias Clasen <mclasen@redhat.com>
Tue, 25 Oct 2016 23:45:48 +0000 (19:45 -0400)
docs/reference/gdk/gdk4-sections.txt
gdk/gdkwindow.c
gdk/gdkwindow.h

index fd542ed1978a646d4fce74c3888634d645c75964..4ff47d9719fdc0086ecaa51ff06435b2d14fcf9f 100644 (file)
@@ -438,7 +438,6 @@ gdk_window_get_root_origin
 gdk_window_get_frame_extents
 gdk_window_get_origin
 gdk_window_get_root_coords
-gdk_window_get_pointer
 gdk_window_get_device_position
 gdk_window_get_device_position_double
 GdkModifierType
index 548f4f072047de9bd7df501da8b044e0220d51ab..c46309cc4a37d649c636036634c4b67f683fb7e5 100644 (file)
@@ -4346,42 +4346,6 @@ gdk_window_constrain_size (GdkGeometry    *geometry,
   *new_height = height;
 }
 
-/**
- * gdk_window_get_pointer:
- * @window: a #GdkWindow
- * @x: (out) (allow-none): return location for X coordinate of pointer or %NULL to not
- *      return the X coordinate
- * @y: (out) (allow-none):  return location for Y coordinate of pointer or %NULL to not
- *      return the Y coordinate
- * @mask: (out) (allow-none): return location for modifier mask or %NULL to not return the
- *      modifier mask
- *
- * Obtains the current pointer position and modifier state.
- * The position is given in coordinates relative to the upper left
- * corner of @window.
- *
- * Returns: (nullable) (transfer none): the window containing the
- * pointer, or %NULL if the window containing the pointer isn’t known to GDK
- *
- * Deprecated: 3.0: Use gdk_window_get_device_position() instead.
- **/
-GdkWindow*
-gdk_window_get_pointer (GdkWindow        *window,
-                       gint              *x,
-                       gint              *y,
-                       GdkModifierType   *mask)
-{
-  GdkDisplay *display;
-  GdkDevice *pointer;
-
-  g_return_val_if_fail (GDK_IS_WINDOW (window), NULL);
-
-  display = gdk_window_get_display (window);
-  pointer = gdk_seat_get_pointer (gdk_display_get_default_seat (display));
-
-  return gdk_window_get_device_position (window, pointer, x, y, mask);
-}
-
 /**
  * gdk_window_get_device_position_double:
  * @window: a #GdkWindow.
index 9a887b7d571ba47a04bf74c917806cdc4ab897bd..4765303534dde27bf042e7a92ad4bcaf0b2b20a2 100644 (file)
@@ -783,13 +783,6 @@ void          gdk_window_get_frame_extents (GdkWindow     *window,
 GDK_AVAILABLE_IN_3_10
 gint          gdk_window_get_scale_factor  (GdkWindow     *window);
 
-#ifndef GDK_MULTIDEVICE_SAFE
-GDK_DEPRECATED_IN_3_0_FOR(gdk_window_get_device_position)
-GdkWindow *   gdk_window_get_pointer     (GdkWindow       *window,
-                                          gint            *x,
-                                          gint            *y,
-                                          GdkModifierType *mask);
-#endif /* GDK_MULTIDEVICE_SAFE */
 GDK_AVAILABLE_IN_ALL
 GdkWindow *   gdk_window_get_device_position (GdkWindow       *window,
                                               GdkDevice       *device,